Replace StringUtils + Partially cleanup FileUtils + Fix unit test #8688
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- The file names in FILES_NOT_TO_COPY are full names and not partial names, so the check should not check if a file name contains such a name, but rather whether a file name fully matches such a name. - Replaced the FILES_NOT_TO_COPY by a HashSet since this provides O(1) lookups, rather than O(n) lookups where n is the size of the set.
Updated due to new API methods than can be useful for this project. The license remained the same.
Use Apache commons.lang3 instead of own implementation.
Use Apache commons.lang3 instead of own implementation.
The functionality in this class has been replaced with the Apache commons.lang3 dependency.
When having "autocrlf=input" (as described in the Building Arduino guide), the `.hex` files used in the test will be a different size due to the test expecting `\n` and git cloning as `\r\n`. This commit fixes this issue by removing cariage returns before running the test.
Pieter12345
force-pushed
the
codebase-consistency
branch
from
b5bfcd3 to
9ed343b
Compare
Not wrapping these calls in FileUtils methods makes the code cleaner and easier to understand (FileUtils is very poorly documented, whereas direct calls contain proper documentation).
Remove unused FileUtils methods without obvious use case or for which a replacement exists in the Files or File class.
Fix CommandLineTest.testCommandLineVersion() failing on Windows due to Runtime.exec() returning `\r\n` line endings where the test expected `\n` line endings.
Pieter12345
force-pushed
the
codebase-consistency
branch
from
9ed343b to
d5ea991
Compare
cmaglie
approved these changes
Mar 26, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Having two StringUtils classes is confusing and not necessary since Apache's StringUtils provides all used functionality.
As for FileUtils; Apache commons.io contains a FileUtils class that can replace the copy / listFiles / delete methods, but some of these methods account for
SOURCE_CONTROL_FOLDERS, which would make the current FileUtils implementation better if theseSOURCE_CONTROL_FOLDERSactually exist in more than one use case.The overall goal of this PR is to make the source code cleaner and more efficient without making functional changes.